Remove redundant link 'Existing blocks for $1' because the blog log is shown since...

And in case the user is already blocked the message "$1 is already blocked. Do you want to change the settings?" is shown

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index eccf75d..19bb7a3 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -811,22 +811,9 @@ class IPBlockForm extends SpecialPage {
         * @return string
         */
        private function getBlockListLink( $skin ) {
-               $list = SpecialPage::getTitleFor( 'Ipblocklist' );
-               $query = array();
-
-               if( $this->BlockAddress ) {
-                       $addr = strtr( $this->BlockAddress, '_', ' ' );
-                       $message = wfMsg( 'ipb-blocklist-addr', $addr );
-                       $query['ip'] = $this->BlockAddress;
-               } else {
-                       $message = wfMsg( 'ipb-blocklist' );
-               }
-
                return $skin->linkKnown(
-                       $list,
-                       htmlspecialchars( $message ),
-                       array(),
-                       $query
+                       SpecialPage::getTitleFor( 'Ipblocklist' ),
+                       wfMsg( 'ipb-blocklist' )
                );
        }
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index ab8de9d..6eef849 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3000,7 +3000,6 @@ See [[Special:IPBlockList|IP block list]] to review blocks.',
 'ipb-edit-dropdown'               => 'Edit block reasons',
 'ipb-unblock-addr'                => 'Unblock $1',
 'ipb-unblock'                     => 'Unblock a username or IP address',
-'ipb-blocklist-addr'              => 'Existing blocks for $1',
 'ipb-blocklist'                   => 'View existing blocks',
 'ipb-blocklist-contribs'          => 'Contributions for $1',
 'unblockip'                       => 'Unblock user',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 56ef4e3..89cca9e 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2012,7 +2012,6 @@ $wgMessageStructure = array(
                'ipb-edit-dropdown',
                'ipb-unblock-addr',
                'ipb-unblock',
-               'ipb-blocklist-addr',
                'ipb-blocklist',
                'ipb-blocklist-contribs',
                'unblockip',